Rename broadwayd to gtk4-broadwayd

This was the last unprefixed binary, and it was causing file
conflicts between gtk3 and gtk4.

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index b99f6b4ce170e09404664bb8f12d84d6813ed3fb..807a408b68153dbd58ab4abc6c6567792a021627 100644 (file)
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -278,7 +278,6 @@ MKHTML_OPTIONS="--path=\"$(abs_srcdir):$(top_srcdir)/examples\""
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =                                        \
        broadway.xml                            \
-       broadwayd.xml                           \
        building.sgml                           \
        compiling.sgml                          \
        css-overview.xml                        \
@@ -286,6 +285,7 @@ content_files =                                     \
        drawing-model.xml                       \
        getting_started.xml                     \
        glossary.xml                            \
+       gtk4-broadwayd.xml                      \
        gtk4-demo-application.xml               \
        gtk4-demo.xml                           \
        gtk4-icon-browser.xml                   \
@@ -486,17 +486,17 @@ EXTRA_DIST += version.xml.in gtk4.types.in
 ########################################################################
 
 man_MANS =                             \
-       gtk4-query-immodules.1          \
-       gtk4-update-icon-cache.1        \
-       gtk4-encode-symbolic-svg.1      \
-       gtk4-launch.1                   \
+       gtk4-broadwayd.1                \
+       gtk4-builder-tool.1             \
        gtk4-demo.1                     \
        gtk4-demo-application.1         \
-       gtk4-widget-factory.1           \
+       gtk4-encode-symbolic-svg.1      \
        gtk4-icon-browser.1             \
-       broadwayd.1                     \
-       gtk4-builder-tool.1             \
-       gtk4-query-settings.1
+       gtk4-launch.1                   \
+       gtk4-query-immodules.1          \
+       gtk4-query-settings.1           \
+       gtk4-update-icon-cache.1        \
+       gtk4-widget-factory.1
 
 if ENABLE_MAN
 

diff --git a/docs/reference/gtk/broadwayd.xml b/docs/reference/gtk/broadwayd.xml
deleted file mode 100644 (file)
index e8fad82..0000000
--- a/docs/reference/gtk/broadwayd.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<refentry id="broadwayd">
-
-<refentryinfo>
-  <title>broadwayd</title>
-  <productname>GTK+</productname>
-  <authorgroup>
-    <author>
-      <contrib>Developer</contrib>
-      <firstname>Alexander</firstname>
-      <surname>Larsson</surname>
-    </author>
-  </authorgroup>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>broadwayd</refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo class="manual">User Commands</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>broadwayd</refname>
-  <refpurpose>Broadway display server</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command>broadwayd</command>
-<arg choice="opt">--port <replaceable>PORT</replaceable></arg>
-<arg choice="opt">--address <replaceable>ADDRESS</replaceable></arg>
-<arg choice="opt">--unixsocket <replaceable>ADDRESS</replaceable></arg>
-<arg choice="opt"><replaceable>:DISPLAY</replaceable></arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1><title>Description</title>
-<para>
-<command>broadwayd</command> is a display server for the Broadway
-GDK backend. It allows multiple GTK+ applications to display their
-windows in the same web browser, by connecting to broadwayd.
-</para>
-<para>
-When using broadwayd, specify the display number to use, prefixed
-with a colon, similar to X. The default display number is 0.
-<programlisting>
-broadwayd :5
-</programlisting>
-Then point your web browser at <literal>http://127.0.0.1:8085</literal>.
-Start your applications like this:
-<programlisting>
-GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 gtk3-demo
-</programlisting>
-
-You can add password protection for your session by creating a file in
-<filename>$XDG_CONFIG_HOME/broadway.passwd</filename> or <filename>$HOME/.config/broadway.passwd</filename>
-with a crypt(3) style password hash.
-
-A simple way to generate it is with openssl:
-<programlisting>
-openssl passwd -1  > ~/.config/broadway.passwd
-</programlisting>
-
-</para>
-</refsect1>
-
-<refsect1><title>Options</title>
-<variablelist>
-  <varlistentry>
-    <term>--port</term>
-    <listitem><para>Use <replaceable>PORT</replaceable> as the HTTP
-      port, instead of the default 8080 + (<replaceable>DISPLAY</replaceable> - 1).
-      </para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>--address</term>
-    <listitem><para>Use <replaceable>ADDRESS</replaceable> as the HTTP
-      address, instead of the default <literal>http://127.0.0.1:<replaceable>PORT</replaceable></literal>.
-      </para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>--unixsocket</term>
-    <listitem><para>Use <replaceable>ADDRESS</replaceable> as the unix domain socket
-      address. This option overrides <literal>--address</literal> and <literal>--port</literal>.
-      It is available only on Unix-like systems.
-      </para></listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-</refentry>

diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 1b4aec442d4587a535ac9925357793783e317e55..f18e16d1a60771d5bb4ed1e4121087d9f934140c 100644 (file)
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -364,7 +364,7 @@
     <xi:include href="gtk4-builder-tool.xml" />
     <xi:include href="gtk4-launch.xml" />
     <xi:include href="gtk4-query-settings.xml" />
-    <xi:include href="broadwayd.xml" />
+    <xi:include href="gtk4-broadwayd.xml" />
   </part>
 
   <part id="platform-support">

diff --git a/docs/reference/gtk/gtk4-broadwayd.xml b/docs/reference/gtk/gtk4-broadwayd.xml
new file mode 100644 (file)
index 0000000..166bce8
--- /dev/null
+++ b/docs/reference/gtk/gtk4-broadwayd.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gtk4-broadwayd">
+
+<refentryinfo>
+  <title>gtk4-broadwayd</title>
+  <productname>GTK+</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Alexander</firstname>
+      <surname>Larsson</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>gtk4-broadwayd</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+  <refname>gtk4-broadwayd</refname>
+  <refpurpose>Broadway display server</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk4-broadwayd</command>
+<arg choice="opt">--port <replaceable>PORT</replaceable></arg>
+<arg choice="opt">--address <replaceable>ADDRESS</replaceable></arg>
+<arg choice="opt">--unixsocket <replaceable>ADDRESS</replaceable></arg>
+<arg choice="opt"><replaceable>:DISPLAY</replaceable></arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+<command>gtk4-broadwayd</command> is a display server for the Broadway
+GDK backend. It allows multiple GTK+ applications to display their
+windows in the same web browser, by connecting to gtk4-broadwayd.
+</para>
+<para>
+When using gtk4-broadwayd, specify the display number to use, prefixed
+with a colon, similar to X. The default display number is 0.
+<programlisting>
+gtk4-broadwayd :5
+</programlisting>
+Then point your web browser at <literal>http://127.0.0.1:8085</literal>.
+Start your applications like this:
+<programlisting>
+GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 gtk3-demo
+</programlisting>
+
+You can add password protection for your session by creating a file in
+<filename>$XDG_CONFIG_HOME/broadway.passwd</filename> or <filename>$HOME/.config/broadway.passwd</filename>
+with a crypt(3) style password hash.
+
+A simple way to generate it is with openssl:
+<programlisting>
+openssl passwd -1  > ~/.config/broadway.passwd
+</programlisting>
+
+</para>
+</refsect1>
+
+<refsect1><title>Options</title>
+<variablelist>
+  <varlistentry>
+    <term>--port</term>
+    <listitem><para>Use <replaceable>PORT</replaceable> as the HTTP
+      port, instead of the default 8080 + (<replaceable>DISPLAY</replaceable> - 1).
+      </para></listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>--address</term>
+    <listitem><para>Use <replaceable>ADDRESS</replaceable> as the HTTP
+      address, instead of the default <literal>http://127.0.0.1:<replaceable>PORT</replaceable></literal>.
+      </para></listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>--unixsocket</term>
+    <listitem><para>Use <replaceable>ADDRESS</replaceable> as the unix domain socket
+      address. This option overrides <literal>--address</literal> and <literal>--port</literal>.
+      It is available only on Unix-like systems.
+      </para></listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+</refentry>

diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
index bb7b43dacc64841b1ac94992e028c8eda11898b0..be5304ac5df116376b075d6eca54cd9d73c8b76d 100644 (file)
--- a/gdk/broadway/Makefile.am
+++ b/gdk/broadway/Makefile.am
@@ -20,7 +20,7 @@ LDADDS = $(GDK_DEP_LIBS) -lrt
 
 noinst_LTLIBRARIES = libgdk-broadway.la
 
-bin_PROGRAMS = broadwayd
+bin_PROGRAMS = gtk4-broadwayd
 
 libgdkinclude_HEADERS =        \
        gdkbroadway.h
@@ -84,7 +84,7 @@ libgdk_broadway_la_LIBADD = \
        $(NULL)
 endif
 
-broadwayd_SOURCES = \
+gtk4_broadwayd_SOURCES = \
        broadway-protocol.h             \
        broadwayd.c                     \
        broadway-server.h               \
@@ -95,9 +95,9 @@ broadwayd_SOURCES = \
        broadway-output.c
 
 if OS_WIN32
-broadwayd_LDADD = $(GDK_DEP_LIBS) -lws2_32
+gtk4_broadwayd_LDADD = $(GDK_DEP_LIBS) -lws2_32
 else
-broadwayd_LDADD = $(GDK_DEP_LIBS) @SHM_LIBS@
+gtk4_broadwayd_LDADD = $(GDK_DEP_LIBS) @SHM_LIBS@
 endif
 
 MAINTAINERCLEANFILES = $(broadway_built_sources)
@@ -106,7 +106,7 @@ EXTRA_DIST += $(broadway_built_sources)
 BUILT_SOURCES = $(broadway_built_sources)
 
 # ------------------- MSVC Build Items ----------------
-MSVCPROJS = gdk4-broadway broadwayd
+MSVCPROJS = gdk4-broadway gtk4-broadwayd
 
 gdk4_broadway_FILES = $(libgdk_broadway_la_SOURCES)
 gdk4_broadway_EXCLUDES = dummy
@@ -116,8 +116,8 @@ gdk4_broadway_HEADERS_INST = $(libgdkbroadwayinclude_HEADERS)
 
 gdk4_broadway_HEADERS_EXCLUDES = dummy
 
-broadwayd_FILES = $(broadwayd_SOURCES)
-broadwayd_EXCLUDES = dummy
+gtk4_broadwayd_FILES = $(broadwayd_SOURCES)
+gtk4_broadwayd_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 

diff --git a/gdk/broadway/broadwayd.c b/gdk/broadway/broadwayd.c
index 84a9c3f3c128c0b9e36096cc33512d12a6184873..b190c55dc78fa85f2cb2691a279e891a5a9746cd 100644 (file)
--- a/gdk/broadway/broadwayd.c
+++ b/gdk/broadway/broadwayd.c
@@ -449,7 +449,7 @@ main (int argc, char *argv[])
     {
       if (*argv[1] != ':')
        {
-         g_printerr ("Usage broadwayd [:DISPLAY]\n");
+         g_printerr ("Usage gtk4-broadwayd [:DISPLAY]\n");
          exit (1);
        }
       display = argv[1];